git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From: Remi Pommarel <repk@triplefau.lt>
   2 Date: Thu, 17 Jul 2025 17:45:29 +0200
   3 Subject: [PATCH] Reapply "wifi: mac80211: Update skb's control block key in
   4  ieee80211_tx_dequeue()"
   5
   6 This reverts commit 0937cb5f345c ("Revert "wifi: mac80211: Update
   7 skb's control block key in ieee80211_tx_dequeue()"").
   8
   9 This commit broke TX with 802.11 encapsulation HW offloading, now that
  10 this is fixed, reapply it.
  11
  12 Fixes: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")
  13 Signed-off-by: Remi Pommarel <repk@triplefau.lt>
  14 Link: https://patch.msgid.link/66b8fc39fb0194fa06c9ca7eeb6ffe0118dcb3ec.1752765971.git.repk@triplefau.lt
  15 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  16 ---
  17
  18 --- a/net/mac80211/tx.c
  19 +++ b/net/mac80211/tx.c
  20 @@ -3883,6 +3883,7 @@ begin:
  21          * The key can be removed while the packet was queued, so need to call
  22          * this here to get the current key.
  23          */
  24 +       info->control.hw_key = NULL;
  25         r = ieee80211_tx_h_select_key(&tx);
  26         if (r != TX_CONTINUE) {
  27                 ieee80211_free_txskb(&local->hw, skb);